Attempting to fix issue #6: Better support for OSX.