Documentation revised
Merge branch 'docs' into develop