Update documentation
Merge branch 'gh-pages'

mergeing.