Added words, fixes #1