Improved Windows compatibility