updated login function
Merge branch 'master' of github.com:joom/simplestever