fixed windows setup crashing (partially)
fixed windows setup crashing (partially) (2)
Previous commit broke unix compatibility, this should fix it
Merge pull request #1 from Chive/fix_windows

Fix windows