More "Fixes"
Merge branch 'master' of https://github.com/cris1133/GreenStream