Streams 159

Pull request open on apache too.