Update main.py

update develop branch from website.
update main.py from local develop branch
update main.py from local develop branch 2
Merge branch 'develop'