Remove master
and slave
from source code
#591
Merged
Loading
master
and slave
from source code
#591