replaced Number.isNaN with isNaN
Merge branch 'master' into gh-pages