Merge pull request #5 from tcmitchell/develop

Develop
Merge branch 'develop' into dagoola