Merge pull request #133 from klausw-g/fix-stuck-highlighting