Fixed a couple documentation errors.
Merge remote-tracking branch 'malloch/master'