Change autodiscovery
Merge pull request #22 from iceraj/develop

Change autodiscovery