OS X & Linux merge