Made it working on windows