Merge pull request #29 from lox/bug/27

Chaining and() and or() in Criteria now works