Merge branch 'master' into develop
feature rollback
Version bump to 0.4.2
bump commit
build commit
Merge branch 'release-0.4.2'