Better management of elif and else nodes. Fix issue #129
Merge pull request #131 from jDramaix/jd_fix-conditional

Improve management of elif and else nodes. Fix issue #129