Now works with OSX (and hopefully still with windows...)