Fix for multiple tokens of the same name
Merge pull request #6 from ionux/master

Fix for multiple tokens of the same name