Merge discovered options
Merge pull request #43 from krasnoukhov/slaves-options

Merge slaves discovered options with original