Re-work match_prefiles a bit due to scrutinizer recommendations
Merge pull request #88 from nZEDb/dev

Re-work match_prefiles a bit due to scrutinizer recommendations