Better Windows support
Merge pull request #5 from mscdex/master

better Windows support