merging changes from osx