Updated documentation
Updated documentation
Merge branch 'doc'