Made slaves a list
Merge remote branch 'origin/master'