wikxml2dict.py - improved