Small fixes
Merge pull request #5 from jrieke/windows

Small fixes