added access to the sample stream
Merge branch 'sample-stream' into incomplete