If/Else/ElseIf-bug-fix
Merge pull request #42 from nvanson/master

If/Else/ElseIf-bug-fix