Add support for elif & else statements. Fixes #19