Dynamic criteria
Merge pull request #28 from umpirsky/feature/dynamic-criteria

Dynamic criteria