merge
minor update: osx projects
minor update: osx projects
merge