Merge pull request #36 from jensopetersen/master

match highlighting
Merge pull request #37 from jensopetersen/master

making it possible to browse after searching