windows compat
Merge pull request #1 from josh04/master

Windows compat