Merge pull request #1 from fuxingyi/dev

i am zangbx ,my password is !#$%^&*();