solve some conflicts
fixed code style
Merge pull request #11 from New-York-Falcons/win-restore

solve some conflicts