Added handling for windows filesystems