more connections
Merge branch 'master' into ui
flotz
Merge pull request #4 from dimerman/ui

Ui