Update documentation
Update documentation
Merge branch 'gh-pages' into static_page_generation