Needs to be tested on another screen
Merge branch 'master' of http://www.github.com/Nieo/teedee