small fixes for the Criteria class
Merge pull request #43 from jochenberger/criteria-fixes

small fixes for the Criteria class