Merge branch 'dev'
Release 0.4.0
Merge branch 'master' into dev
Bump to 0.4.1-SNAPSHOT