Modified height width in Slave
Merge branch 'Slave'