windows compability
Merge pull request #319 from trett/master

windows compability