Properly highlight the original word in a phrase (guard with word boundaries)
Merge pull request #1 from mebubo/master

Fix word highlighting