working regex
Merge pull request #37 from eduncan26/development

working regex