Merge pull request #579 from public/words

s/which/that/