Fix from @TomasJansson; Added wikipedia links
Merge pull request #5 from bartelink/master

Fix from @TomasJansson; Added wikipedia links