Osx

@albertogaitan this is for you. Check out my comments here.