merge files from branch jz, update the help message