Add stream, fixes #16