OS X modifications
Merge