Bump version to 0.3.2 for release
Bump development to 0.3.3-SNAPSHOT
Merge with origin/development and small fixes.