socket
socket copied to clipboard
Update 'master' from 'dev'
Should this one be merged before release v0.6.0 or after?