Documentation edits
Merge remote branch 'upstream/master'
Merge pull request #22 from davidcurrie/master

Documentation edits