stream bug corrected in oapmc
Merge remote-tracking branch 'origin/master'
correct merge