Added support for all-criteria
Merge pull request #11 from lasseebert/support-for-all-criteria

Added support for all-criteria