Fixes #6
More words added. Refs #5