socket bug
Merge branch 'develop' into encrypto