Merging Master Changes with gh-pages