add OSX setting
Merge branch osx-setting