Add support for streaming.
Merge remote-tracking branch 'octo-chat/master'

Conflicts:
	.idea/workspace.xml
Add support for streaming.