Case insensitive highlighter
Merge branch 'Case-insensitive-highlighter'