Merge pull request #2 from zwhfly/master

3f
3g1
3g2
Merge pull request #3 from zwhflytest/master

3g