Merge pull request #3 from deverett/master

Port Agent Fixes.