Fixed #1 highlighting word boundaries issue