jj
Merge pull request #21 from kristhus/loginfix

jj