merge files from branch jz, update the help message
Merge branch 'master' into jz