3102590 Merge pull request #18 from librasteve/hilite