Refactored wikipedia.py, which fixes #1.