Merge pull request #2 from onlyjsmith/develop

Develop
Merge branch 'develop'
Merge branch 'master' into develop