Updated
Update
Merge branch 'master' of https://github.com/lorsem/SmartStream
Merge branch 'master' of https://github.com/lorsem/SmartStream