Merge pull request #22 from davidcurrie/master

Documentation edits
Documentation changes
Documentation changes