Merge pull request #4 from madAndroid/master

Add groups switch to agent config, to accommodate change to main binary
merge upstream changes