added OS X support