Login version 1.1
Merge origin/master