Added and- and or-expressions

Added support for the and- and or special-forms.