windows fixes
Merge pull request #83 from weltling/master

windows fixes