More extensive vocabulary
Merge pull request #2 from shreve/master

More extensive vocabulary