Now working on Mac OS X as well as Windows