Updated the documentation
Merge commit 'ae5fc05'