Update documentation
merging from gh-pages