fixed over 30 TODOs
Merge branch 'master' of http://www.github.com/Nieo/teedee