Added Mac OS X support