Use stream context, better performance.
Merge branch 'incoming'