cleaned code, added support for wikipedia
Merge pull request #2 from joelmertanen/master

cleaned code, added support for wikipedia