修改str
Merge branch 'chende'
Merge branch 'master' into chende