Merge pull request #23 from wagnert/master

Fixing path handling for Windows
Add correct Windows OS detection