Merge pull request #1 from Speedy37/develop

Develop
Merge branch 'develop'