Windows 2

content windows 2
Resolved merge

resolved windows changes