Merge branch 'release/v0.3.1' into develop
Merge branch 'hotfix/v0.3.2' into develop
Small fix
Merge branch 'develop'