Added compatibility with Windows