Updated constructor calls, created Criteria
yay merge conflicts
Merge pull request #13 from spirnuise/master

Updated constructor calls, created Criteria