Added OS X support (hopefully)