Cleanup replaceTokens
Merge pull request #101 from WouterJ/patch-1

Cleanup replaceTokens