Update to 0.4.2
Merge branch 'release/0.4.2' into develop