changing package names for osx
Merge branch 'master' into macosx