updated http-streams branch