Add else/else if
Merge pull request #30 from ngscheurich/master

Add else/else if