Added option for using HTTP