Added Support for OSX and Linux