Merge changes for release v0.3.1