Fixed bug and Modify windows project