Merge branch 'master' into develop
Version bump to 0.3.1
fixed #1
Merge branch 'release-0.3.1'