Merge pull request #19 from Handison/master

Changing in slave.cc