Merging master and gh-page