Now works on Mac OSX as well