Merge pull request #7 from Memphiz/master