Merge branch 'release/0.3.1' into develop
Fix #12 (Fix the fix for #11)
Bump version to 0.3.2
Merge branch 'release/0.3.2'