Merge pull request #4 from jamesdsmith/develop

Develop