added osx natives
Merge branch 'master' into develop