merge and fix for windows