Version 0.4.6
Merge branch 'hotfix-0.4.6'