merge latest updates from branch gh-pages