Robin Giltner
I didn't go through and thoroughly test it, but it appeared to be working (famous developer last words :-) )
Let me know if you have any problems.