Merge branch 'release/0.1.1' into develop
Bugger, looks like I lost a commit somewhere between master and develop!

Merge branch 'master' into develop
Version bump