Feature/itxt 4/folsom/master