add support for logical or, and, not in parsing
bugfix, srry