Merge pull request #1 from xiangchuanxc/master

hh
Merge pull request #1 from StillModern/master

Merge pull request #1 from xiangchuanxc/master