Added connection dialog
Merge pull request #9 from jinxo13/autodiscovery_fixes

Fixes to make auto-discovery more robust