Windows Support [fix #142]

For #142, #161