Updating documentation under #17
Merge branch 'master' into next