merge of windows and linux config. Windows is OK now