Feature/takao

pull request