Added OSX Support (initial)