[TV] - Proper build
Merge pull request #452 from michalbe/master

[TV] - Proper build