Merge pull request #33 from ruebot/7.x

Strip out $token