Added nouns and adjectives. Fixes #7