Adding OSX and Windows support.