if-statement support added (else still missing)