Merge pull request #91 from james-lawrence/file-based-matchers

file based matchers