Work on Windows
Merge pull request #1 from LastProject/master

Work on Windows