More win32 support!
Merge pull request #27 from mpasternak/master

More win32 support!