Merge pull request #18 from willprice/develop

Develop
Merge pull request #19 from willprice/master

Merge pull request #18 from willprice/develop