Changes for Windows support
Merge pull request #71 from Dandandan/master

Changes for Windows support