Merging ci changes from gh-pages to master branch