Merge branch 'develop'
Prepare 0.4.1 release
Merge branch 'master' into develop