Short ternary operator
Merge pull request #113 from cedricdeschenes/ternary_fix

Short ternary operator