Version 0.3.1
Merge branch 'release-0.3.1'