Version 0.4.7
Merge branch 'release-0.4.7' into develop