Merge master and gh-pages

Add @Andrew-Tierno's edits