Added Wikipedia code, but with issues.
Merge remote-tracking branch 'origin/master'