Merge branch 'release-0.4.0' into develop
Code cleanup
Merge branch 'cleanup' into develop
Bumped version to 0.4.1
Merge branch 'release-0.4.1'