Release v0.3.1 (bugfix and cleanup release)
Merge branch 'release-v0.3.1'