Resolves #409. Now matches dashes in addition to alphanumeric and _ characters