This was supposed to be PRd by moononournation, but since he never did, I went ahead and added it to a branch.
Marcos Kirsch