Merge branch 'hotfix/v0.3.1'
Fix [""]
Merge branch 'hotfix/v0.3.2' into develop