Update documentation
Merged

Merge branch 'gh-pages'