Merge pull request #25 from osscca/master

Minor (but a lot!) text changes