Should work under windows now