adapt code
Merge branch 'http_stream'

Conflicts:
	.gitignore