Improved conditional exp creation.
Merge pull request #13 from darkowlzz/condExp

Improved conditional exp creation.