Merge master and gh-pages

Unifies minor code updates