Slight change to get it working in windows without errors everywhere.