Change isNan method
Merge branch 'master' into nserror