Highlighter finds the first occurrence
Merge pull request #169 from dg/pull-hightlighter

Highlighter finds the first occurrence