- Added Windows support