Add short-circuit evaluation for logical operators. Closes #255