Fixed issue # 1.
Merge branch 'master' of https://github.com/rjerickson/tsu-2.0