Updated docs
Merge branch 'feature/docs-generator' into gh-pages
Updated docs