improved feedback highlighting performance
Merge pull request #5 from michelleoj/master

req
Merge pull request #13 from lu16j/master

req