slave first commit
Merge branches 'slave' and 'master'