Iss1/wikipedia

Hej! Please review my code @aubry74 and @rollier!