Merge pull request #1 from Krasnyanskiy/develop

Develop