Merge pull request #4 from sheldrand/develop

Develop in to master