Merge pull request #1589 from marcel-blonk/PLFM-3015

handle NaN, -Infinity and +Infinity