Merge pull request #137 from klausw-g/highlight-stacked