Adding nouns and adjectives; fixes issue #7