Issue #20
Change the directory management on the agent
Merge pull request #21 from vincent-zurczak/master

Fixes #20