Merge pull request #6 from aphearin/develop

Develop