Merge pull request #1 from jonjo-blur/develop

Merging to master for the v1.0 release
Merge pull request #2 from jonjo-blur/master

Merge pull request #1 from jonjo-blur/develop