Merge pull request #8 from muminoff/master

Corrections before release
Merge pull request #9 from muminoff/develop

Merge pull request #8 from muminoff/master