script merged to master from task_2