update documentation
Merge remote branch 'origin/fixingDocumentation'