commit amend by maco
Merge branch 'master' of https://github.com/macococo/gittest