first commit in slave
Merge branch 'slave'