Merge branch 'release-0.3.0' into develop
upgrading to 0.3.1
Merge branch 'release-0.3.1'