Merge branch 'gh-pages'
Checks to see if valid number
Merge branch 'master' into gh-pages