Merge changes in Master and gh-pages.

Want to merge changes between the two branches.