merge files from jz branch
Merge branch 'master' into jz