Small fixes to make more pleasant on Windows
Merge pull request #4 from domenic/patch-1

Small fixes to make more pleasant on Windows