Feature/takehiro