merge change of @fukuball