Add cross platform support for Windows and Mac OSX