Avoid extra string test
Merge pull request #507 from checat/elseif

Avoid extra string test