Merge pull request #58 from maksimov/develop

Develop