Fixed #17 -- work on win32