Updated the documentation
Merge commit '9470c7a'