Feature/iteration 6 dev issue 270