Merged project 15_05_2013