v.0.4.0 -- version bump, and cleanup
Merge branch 'release/0.4.0' into develop