Fixing this branch to work on Windows.