Socket demo
Merge branch 'changing'