Implementations of Rob's Updates
Merge branch 'master' of https://github.com/basisworldwide/SumTV

Merge message