Merge remote-tracking branch 'origin/master'
added args to main for cmd line running