merging latest changes into gh-pages