Support for conditional operator
Merge branch 'master' of https://github.com/stelian56/dicta