Merge branch 'hotfix/0.3.1'
Bumped version to 0.3.1
Merge branch 'master' into develop