Fix for broken live streams
Merge pull request #16 from meriko/master

Fix for broken live streams