fix bugs
Merge pull request #16 from chzyer/feature/fix_token_tag

fix bugs