Slave changes 1
Merge branch 'slave'