Merge branch 'release/0.2.1'
Merge branch 'release/0.3.0'
Bumped version number
Merge branch 'hotfix/0.3.1' into develop