Some errors in the doc.
Merge remote-tracking branch 'upstream/master'
regular routine update
Merge remote-tracking branch 'upstream/master'
update
Merge pull request #9 from johncburnham/master

Fixed some errors in the doc (found by Chris Cole)