improved Windows detection
updated changelog for #901
Merge pull request #901 from mcandre/master

Improved Windows detection