Added windows compatibility