Feature/kojima