Merge pull request #163 from COPPER-BOBCAT/staging

Staging
fixed bug in auth
Merge pull request #165 from power9/master

fixed bug in auth