latest changes for osx from mathias repo
updates