Merge pull request #21 from peternewman/master

More doc changes