Updated documentation.
Resolved merg conflict.