Should have mentioned, discspan.py already has the changes, I just included the patch file if you want to see what changed.