support for filters: and/or
Merge pull request #120 from ppat/master

support for filters: and/or