Bug-19 Starred words

Ok, got it. Sounds reasonable. Please keep the current version.