Move the criteria to a factory so that we can customize it
Merge pull request #14 from stanlemon/criteria-factory

Move the criteria to a factory so that we can customize it