Fixed bug32
Merge branch 'hotfix.32.v1.0.1'