conditional expressions support
Merge pull request #15 from machard/master

Conditional expressions support