Fix more windows path problems
Merge pull request #28 from mjaverto/master

Fix more windows path problems