merge dev into windows support