Cleanups
Bump version to 0.4