Merge branch 'TingBranch'
Merge branch 'master' of https://github.com/ThienPhong/SimpleStreamer