git merge src/forest.cc src/forest.h and two tests files from branch jz