Updated to OS X branch