Refactored code not to use the popup and to re-connect each time.
Changed icon
Merge branch 'master' into cws