hotfix 0.4.2
Merge branch 'hotfix/0.4.2'