Merge pull request #9 from fpaut/agent