Merge pull request #1 from whuthm/master

// add by huangming
//add by 642651572
other
Merge pull request #1 from 642651572/master

合并主分支代码