And and Or are more efficient now.
Merge branch 'master' of https://github.com/signescholer/ov
added AndOr-test and fixed whitespace in lexer.