Nested ifs have to die, this commit kills one of them
Merge pull request #51 from adomokos/cleaning_up_a_nested_if

Nested ifs have to die, this commit kills one of them