Fix infinite loop in highlighter
Fix highlighting when multiple matches
Bump version
Finish 0.2