Feature/file matcher only

Rebased on master for #173