1st Change for Windows

Merge Demo