remove constraint on and/or
Merge pull request #2 from bqsoft/and-or

remove constraint on and/or