Fold in changes
Merge branch 'release-0.4.1'