Streamlined if-else-if
Merge pull request #62 from dandv/patch-1

Streamlined if-else-if