improvied code style of convertToCondExpr function to be more functional
Merge remote-tracking branch 'origin/master'