Add highlight-selection support. Issue #84