updating master and gh-pages branches