Added login
Merge origin/master
Added login