Update to use every OS(Linux  & Mac)