implemented fix for multitple streams being accessed
Merge remote-tracking branch 'origin/master'