Version bumped from 0.3.1 to 0.4
Merge branch 'release-0.4'