Merge pull request #6 from tcmitchell/develop

Develop