[new] Fixed that highlighting stuff
Merge branch 'master' of https://github.com/mahsu/YoTellMeAStory