Merging Changes in gh-pages to master