Prepare 0.4.7 release
Merge branch 'develop'
Prepare 0.4.8 release