#409 - Now matches dashes in addition to alphanumeric and _

Added character groups to include \w and hyphens.  Thanks to @evansobkowicz for the help.

See Issue #409