Merge pull request #5 from apache/else

and the -else clauses