last login fixes #34
Merge branch 'dev'