Merge in reference to xhr from #5