Merge pull request #1 from evillove521/master

hu
test
test
Merge pull request #1 from Milao/master

merge