Export for Windows, please!
Minor changes for Windows compatibility