commit 1

merge windows