Merge tag '0.4.1' into develop

Released 0.4.1 0.4.1
bugfixes and better naming
bumped version
Merge branch 'release/0.4.2'