branch test
Merge branch 'master'
A change by Chris in MainFunction