Merge pull request #122 from COPPER-BOBCAT/staging

Staging
rid bugs in log out
Merge pull request #123 from power9/master

rid some bugs in log out