Make pulling groups optional
Merge remote branch 'origin/master'