Working under ubuntu, needs osx testing