Consistency is king
Merge pull request #99 from abstractj/refactor-agent

Consistency is king