Hotfix for 0.4.7
Merge branch 'hotfix/0.4.7'