add condition for NaN
Merge branch 'master' of https://github.com/rcorp/dijitx