Version 1.0.1

Bugfix release
Merge branch 'master' into dev
Version bump to 1.0.1