Fix for logout issue #4
Merge branch 'master' into navigations