added some windows support