1st changes for windows

merge demo