If you are willing to merge it as it is, I'll try to fix it sometime later.