I think the changes above are fine and I would like to merge it (although I don't recommend transmitting code via HTTP...)