Added Windows support