Merge branch 'develop'
v0.3
Merge branch 'master' into develop