Merge pull request #12 from aphearin/develop

Develop