fix highting logic
Merge pull request #12 from bgirard/fix-highlighting-logic

fix highting logic