Do you have a fork or the changes? I might take a look, and python dependency hell on Sunday is no good