Fixed code of deliverable 1.1