Merge pull request #4 from Pyrohh/master