Update documentation
Fixed merge conflict
Update documentation
Merge branch 'gh-pages'