Merge pull request #131 from klausw-g/highlight-NaN-2