cleaned code, added support for wikipedia