Revised Deliverable 1

Deliverable Fixed according to comments