Merge pull request #1 from adamamyl/develop

Develop
Merge branch 'master' into develop