Some corrections. Need to test more.
Merge branch 'master' of https://github.com/rockwolf/python

Some corrections. Needs more testing.