Feature/file matcher only

This one supersedes #164, but contains #172 to make tests pass.