Adds support for hyphens