ifs and conds now taken care of
Merge branch 'master' of github.com:polasek/tscheme