Merge pull request #16 from aphearin/develop

Develop