Merge pull request #2 from pepoc/master

modify login a
Merge pull request #4 from resJson/master

Merge pull request #2 from pepoc/master