minor code cleanup
update release notes
bump version
Merge branch 'release/0.4.0' into develop