Merge pull request #7 from tcmitchell/develop

Develop