Merge pull request #98 from njtaylor/master

Fixes for ITV, Channel 4, Ustream