Added better windows support