bug fixed
Merge branch 'master' into 0.4.6a