Merge pull request #238 from jkuk/master

log in fix