Issue #17 fixed. Duplicacy problem while adding slaves solved.