Fixed OS X support and bumped