Feature/iteration 4 dev requirment bug fix