Refactoring signin stuff
Merge pull request #223 from gmist/refactoring_signin

Refactoring signin stuff