Started #3 and fix for inigo-llc/token_authenticate_me#11