Merge pull request #1 from Bobboya/master

merge
Merge remote-tracking branch 'master/master' into louis

Updating to the newest version
added link to wikipedia
Merge pull request #2 from lpoignant/louis

Louis
Merge pull request #10 from lpoignant/master

Commit wikipedia link