Update to work on Mac and Windows
Now honors path correctly