Feature/bresia branch #2