Merge pull request #1 from johnnywidth/develop

Develop
Merge pull request #3 from johnnywidth/master

Merge pull request #1 from johnnywidth/develop