Merge branch 'dev'
Release 0.4.1
Bump to 0.4.2-SNAPSHOT