Windows changes
Merging with master