wiki.py added
formating of result changed
functions updated