Merge tag '0.3.2' into develop

Released-0.3.2 0.3.2
refactor bugfixes
bumped version
Merge branch 'release/0.3.3'