Fixed a few minor bugs.
Merge branch 'master' of https://github.com/erecruit/TsT