Merge pull request #11 from Memphiz/master