adding changes to the slave branch
Merge branch 'slave1' into slavefortesting
commiting changes for slave 1 from another branch