Merge pull request #1 from meriksk/develop

Develop
Merge branch 'master' into develop