Feature/club 632

Nice. Pity travis is out :-(