Refactored Highlight
Merge pull request #259 from eugenst/refactor_highlight

Refactored Highlight