Updating documentation
Updated documentation
Merge branch 'master' into auto-annotations