Refinement to regex search, still needs tweaking
Merge pull request #35 from ryanshawty/dev

Refinement to regex search, still needs tweaking