Made corrections to the ods, changes where needed here too.
Merge branch 'master' of http://github.com/rockwolf/python_generic

Merge.
148.6015 is still not the result. The rest is ok.