changes from last repo
Merge pull request #1 from ksenna/login

changes from last repo