Simplify _add_back_token and _add_back_tokens
Merge pull request #29 from r-e-d/master

Simplify _add_back_token and _add_back_tokens