Added conditions for Mac / Linux