Version bumping and some minor updates
Merge branch 'release/0.4.2'
Merge tag '0.4.2' into develop

Version 0.4.2