better highlight finder
Merge pull request #2 from jcupitt/master

better highlight finder