Merge pull request #1 from bmeudre/windows

Windows