Merge branch 'release/0.4.0' into develop
data handling bugfixes
bumped version
Merge branch 'release/0.4.1'