Merge pull request #247 from biometrics/eval

Eval matches fix