Windows support
merged minor conflict in draw.c