Mac OS X support added