Fix for #16 and #18. Tests for highlight