Merge pull request #1 from Krasnyanskiy/develop

Develop
Merge pull request #2 from Krasnyanskiy/master

Merge pull request #1 from Krasnyanskiy/develop