Fixed bugs
Merge branch 'release/v0.4.7'