Fixed field token implementation.
Merge pull request #10 from md-systems/field-tokens

Fixed field token implementation.