Added Windows compatibility