Added stream choices
Merge origin/master