Fix else condition tag mismatch

[kethinov]

closes #230

closes #229

closes #226

[coveralls]

Coverage remained the same at 90.541% when pulling d5f0053 on fix-else-condition-tag-mismatch into 4430a51 on master.

[coveralls]

Coverage remained the same at 90.541% when pulling d5f0053 on fix-else-condition-tag-mismatch into 4430a51 on master.

[kethinov]

@alallier test this out to see if it resolves your issue

[alallier]

Almost there, I found one more problem. Added a new test in my open PR #226. See commit 337d5a5

[coveralls]

Coverage increased (+0.03%) to 90.572% when pulling 53c06e7 on fix-else-condition-tag-mismatch into 4430a51 on master.

[coveralls]

Coverage increased (+0.03%) to 90.572% when pulling 500bee4 on fix-else-condition-tag-mismatch into 4430a51 on master.