Hotfix 0.4.8
Merge branch 'hotfix/0.4.8'