Merge pull request #135 from klausw-g/highlight-NaN-3