first commit
Merge pull request #61 from zhangQP/branch-zhangqipeng

Merge zhangQP's change.