Fixed conflict
Fixed conflicts
Merge pull request #54 from sposs/AgentFixes

Agent fixes