Added a new way to parse conditions. Also added support for some rudimentary OR parsing. Added appropriate test cases