Fix issue #2 regarding WIN32 systems.
Fix issue #2 regarding WIN32 systems, fix messy merge.