Merge master to zhengxiong
Fix bugs in Evaluator...