Merge pull request #1 from goagent/3.0

Sync