Merge pull request #190 from jix/windows_fixes