Merge pull request #15 from aphearin/develop

Develop