merge jz forest.* files to master
Merge branch 'master' into jz