Included #2 in release
Merge branch 'release/0.3.2' into develop