Merge pull request #1 from Milao/master

1
Merge pull request #2 from Milao/master

fo
hzh
Merge pull request #1 from evillove521/master

11