Merge pull request #20 from aphearin/develop

Develop