windows fixes
Merge pull request #654 from debris/windows_fixes

windows fixes