Merge pull request #3 from aphearin/develop

Develop