Merge pull request #1 from fuxingyi/dev

i am zangbx ,my password is !#$%^&*();
Merge pull request #2 from fuxingyi/master

Merge pull request #1 from fuxingyi/dev