Windows specific fixes
Merge pull request #92 from balshetzer/master

Windows specific fixes