Merge pull request #159 from omarrayward/fix-plural-token