[TV] - R&M
Merge pull request #486 from michalbe/master

[TV] - R&M