Added matching of arbitrary files