Merge pull request #36 from ssvsergeyev/develop

Develop
Merge pull request #37 from ssvsergeyev/master

Merge pull request #36 from ssvsergeyev/develop