Merge branch 'release-0.2.3' into develop
Bumped version to 0.3.2
Merge branch 'release-0.3.2'