Add documentation and a typo
Merge remote-tracking branch 'origin/master'