Enrich words
Merge pull request #182 from alxgnon/words1

Enrich words