Patch attached.

I'd like to sort copyright papers too, let me know what's necessary.