update from changes done in gh-pages branch