mac os x changes
merge