3.0

merge lastest change from goagent/goagent.