Merge pull request #139 from klausw-g/stacked-NaN