Refactor connections
Merge branch 'master' into supertab