Merge pull request #158 from aeischeid/master

updated smart_highlighting plugin from http://code.google.com/p/smart-hi...