Added windows compability