Merge pull request #1 from milot/dev

Added wikipedia link
Named a variable properly...