Adding better support for windows. #42 #47