highlight updates
Merge pull request #177 from shutter111/master

highlight updates