Merge pull request #61 from eile/master

Improvements based on Carlos O. review
Fix Win32 build for downstream projects
Merge pull request #62 from tribal-tec/master

Fix Win32 build for downstream projects
-win32 fix build
Merge pull request #63 from VMML/win32fix

-win32 fix build
Simpler fix for #63