Merge pull request #19 from matthieuHanne/AgentsEnvMaster

Agents env master
Hot fix by hangouts
merged with master, AGAIN