now with more wikipedia support
merged init.py merge