added cookie_domain option
resolved merge conflict