Support multiple videos
Merge branch 'streamtest'