merging latest changes in to gh-pages branch