Fixes #98. NestedTernary done
Merge branch 'master' into issue_#51