Added OSX & Windows Support