Made it work on Windows