upd 28.07

Take to account todo-file