Introduce token polymorphism
Merge pull request #24 from widop/f-token

Introduce token polymorphism