Added support for hyphens between words