Added error message for NaN, stylized
Merge branch 'master' into gh-pages