Merge branch 'gh-pages'
Doc update, plus some bounds checking
Updated example page
Merge branch 'master' into gh-pages
More doc updates
Merge branch 'master' into gh-pages