patches applied, ready to roll

I applied the patches you sent me, so here is the pull request =)