Fix display
Merge branch 'master' of https://github.com/cbnuke/tong.git