Update documentation
Merge branch 'gh-pages'

* gh-pages:
  Update documentation