Expression if-then-else block
Merge pull request #589 from CelticMinstrel/master

Cool idea!