Merge pull request #2 from lijiahe/develop

Develop
modified on develop branch liuhao
Merge pull request #10 from liuhaotq/develop

Develop