Did some stuff to make it work on windows