Added if/else/elseif statement. 

Not able to test it as boolean_expr do not work yet