Merge branch 'release/v0.3.1'
Incremented version number to v0.4.0.
Merge branch 'release/v0.4.0'