Update documentation
Merge branch 'gh-pages'
merge with gh-pages