fix if then else
Merge branch 'master' of github.com:ssql/ssql