A better connect2agent
Merge remote branch 'origin/master'