Adding handling for cygwin