windows fixes
Merge pull request #29 from weltling/master

windows fixes