Merge pull request #10 from fpaut/agent