Merge pull request #5 from duncandc/develop

Develop