Also this should now behave better on windows (I don't know for certain, I can't test it there).