Feature/club 537