trex2 input
fix bugs trex2 4/30 Tao
trex small fix
Merge remote-tracking branch 'origin/tao'