Finally found some time to do this, upgraded to 4.1, perhaps this will be faster?

This version is a security update. Is 4.1 production-ready? Who knows…