Merge pull request #126 from klausw-g/highlight3