rewrite normalizeCriteria to fix OR + CONTAINS bug
Merge pull request #70 from vpegado/master

rewrite normalizeCriteria to fix OR + CONTAINS bug