finish Login #115
Merge pull request #226