Solve issue with change in token-field
Merge pull request #38 from ertaiNL/master

Solve issue with change in token-field