WordHighlight works in all versions
Merge pull request #1896 from adzenith/master

WordHighlight works in all versions