Merge pull request #18 from willprice/develop

Develop