Add support for Windows and Mac OS X