Composite AND and OR
Merge branch 'master' of https://github.com/mkirchmann/pdvfm