Merge remote-tracking branch 'origin/feature/highlight' into feature/highlight
* Added support for phrases in highlighting
* Changed highlight styling to bold