Merge pull request #24 from lianqin7/master

file.contain bugfix for windows.
Merge pull request #3 from lepture/master

merge master