fix bug
Merge branch 'for_local2' into master_chinese