Updated documentation
Merge origin/master