More logout fix
Merge remote-tracking branch 'upstream/master'
Merge pull request #10 from JulianJaffe/master

More logout fixing