Fix for Windows detection

Fix commits for #31