first version
Merge github.com:qhshi/TestGit
local modify