Fixes for Windows and Mac OSX(Darwin)

• A patch for Windows via COM.
• A patch to avoid confusion on OS detection on Mac OSX.