Merge branch 'accept_task' with master