Added osx pod support
Merge branch 'osx-pod-support' into develop