Merge pull request #9 from aphearin/develop

Develop