update for osx
Merge branch 'temp_branch'