Better normal logout support
Better normal logout support+
Merge branch 'master' of github.com:Xervmon/Xdocker