main.py: better comments
main.py: merge
Merge pull request #3 from proppy/master

main.py: better comments