Syncing in master and gh-pages

Syncing between master and gh-pages