Okay, I've updated the gists and attached the modified patch as discussed.