Merge pull request #26 from osscca/master

Additional text changes.