Merge pull request #2 from dayax/master

Merge to release