Merge pull request #31 from chead/develop

Develop
Merge pull request #48 from chead/develop

Develop