Cleanup
Bump version to v0.3.1