Merge branch 'release/v0.3.4' into develop
Version 0.3.4
Merge branch 'develop'