Merge pull request #24 from fpaut/agent_future