Make token more usable.
Merge pull request #1 from ziyan/master

Make token more usable.