Merge pull request #1 from zwhfly/master

"--no-ff"?
zwhfly def
gg1
gg2
Merge pull request #2 from zwhflytest/master

merge back and forth