Merge pull request #1 from dump247/token_auth

Token auth fixes