Merge branch 'release/0.3.0'
Fixed inconsistent version tagging
Merge branch 'hotfix/0.3.1' into develop