added tmva support
solved merge conflicts