new line added
user name and password check
Merge remote-tracking branch 'eph/master'