Merge pull request #7 from Pyrohh/master