Merge pull request #4 from sheldrand/develop

Develop in to master
Merge pull request #5 from sheldrand/master

Merge pull request #4 from sheldrand/develop