Merge pull request #22 from bukzor/unify-if-loop

unify visitors for if and loop statements