new thing in master main.py
Merge branch 'master' into samtestbranch