Improve highlighting + file match
Merge pull request #3 from postcasio/master

Various changes