stub for customizable socket connection logic
Merge branch 'master' into development