Some agent stuff
Merge branch 'master' of github.com:gareth-cross/CHARM
Any changes