Merge branch 'gh-pages'
updates and validation
Merge branch 'master' into gh-pages