Mod detection is finally to a point where I can add this and close #42