cleanup
Support for "and"/"or" in "if"/"elif" expressions.
Merge branch 'dev'