edit from cygwin
merged