Merge pull request #22 from aphearin/develop

Develop