Add OS X support