Add Token Fields
Merge pull request #14 from fbrusatti/ed/add_token_fields

Add Token Fields