fixed authentication error
Merge remote branch 'upstream/master'
phil again
phil again