Tokens: table fix
Merge pull request #4 from silvianunez/master

Tokens: table fix