Added switch to disable/enable discovery
Merge pull request #3 from jvandesande/DiscoverySwitch

Added switch to disable/enable discovery