merge in changes from windows machine