Merge branch 'master' into develop
Version v0.3.2
Merge branch 'develop'