Fixes a bug in Auth
Merge branch 'origin/master'