Adding support for multiple hyphens, and adding multiple hyphen words.