New version of the docs
Merging temp-branch