Merge pull request #1 from apolukhin/develop

Develop
Merge pull request #2 from apolukhin/develop

Develop
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'