working version demo 1 windows
merge fixed