Feature/task36

Task#36 done