Merge pull request #23 from mattn/win32