Added OSX & Win32 version