Merge pull request #61 from nubs/master

Add support for ?: shortcut.