New set_auth_token function
Added newline
resolved merge conflicts
Merge branch 'brk00-master'