Merge pull request #27 from aphearin/develop

Develop