Add auto discovery support
Merge pull request #1 from Nibbler999/auto-discovery

Add auto discovery support