Merge branch 'hotfix/0.3.1'
Merge branch 'release/0.3.2'
updating to 0.3.3
Merge branch 'hotfix/0.3.3' into dev