Add multi-colored highlighting
fix a typo
Merge pull request #25 from AlexSane/master

Add multi-colored highlighting