Fix from @TomasJansson; Added wikipedia links