Created by: cannona
Now allows the use of short circuit and ternary expressions.
Resolves #722 (closed).