Version bump to 0.3.1
Merge branch 'release0.3.1' into develop