Merge branch 'release/0.3.2' into develop
Minor refactoring
Version number to 0.3.3
Merge branch 'release/0.3.3'