Some more stuff
Merge branch 'master' of github.com:polasek/tscheme
Last-minute bug fix (took quite a bit of work)
Merge branch 'master' of github.com:polasek/tscheme