fixed login error
Merge branch 'master' into login_error
Merge pull request #25 from nullet/login_error

Login error