adds ability to autodiscover
Merge pull request #2 from jessepollak/auto-discovery

Adds ability to autodiscover