Merge branch 'hotfix/0.2-hotfix1'
Merge branch 'release/0.3'
0.3.1
Merge branch 'hotfix/hotfix-0.3.1' into develop