git merge forest.h from jz branch
Merge branch 'master' into jz