Merge branch 'master' into develop
Fixes #7
fixes #8
Cleanup commit due to commit on wrong branch
Merge branch 'release-0.3.9'