Merge branch 'release/0.4.0'
Merge branch 'release/0.4.2'
Merge tag 'version/0.4.2' into develop

0.4.2