documentation generation
Merge master into gh-pages
Auto-generating documentation