merge Dima's update
merge Dima's update

chunshen1987/hadronic_afterburner_toolkit,chunshen1987/hadronic_afterburner_toolkit,chunshen1987/hadronic_afterburner_toolkit,chunshen1987/hadronic_afterburner_toolkit