Changes to main.
Merge branch 'master' of https://github.com/rockwolf/python

Merging main.py changes with the remotely edited files.