Merge pull request #19 from fpaut/agent