Updated description
Merge branch 'slave'
fixed misplaced text in description
Merge branch 'slave'