Feature/add ifl master