Feature/141105/battle