Version 0.4.1
Merge branch 'hotfix-0.4.1'