fixed highlight changes
Merge branch 'master' of https://github.com/ixu/6878Project