Add initial criteria feature
Merge pull request #22 from Rothcold/master

Add initial criteria feature