s
Merge branch '3.0' of https://github.com/siryang/goagent into 3.0
update