Merge pull request #53 from blackcobra1973/develop

Develop
Merge branch 'master' into develop