Added local version of hightlight.
Added local version of hightlight.
Merged changes from master