Merge pull request #202 from wshafer/master

Moved logout check to core
Merge remote-tracking branch 'upstream/master'