Merge pull request #106 from jtwigg/develop

Develop