add if
add if with a short statement
add if-and-else
merged from hubo-dev
merged from dev