Hotfix 0.4.9
Merge branch 'hotfix/0.4.9'