Merge pull request #1 from Qstar/develop

Develop
Merge branch 'master' into develop