modify for Win32 support
Merge pull request #57 from jmckenna/master

Win32 changes to compile with master