Merge branches 'master' and 'dev'
Merge pull request #22 from proxyio/dev

[feature] add test for socket
[feature] rename sio_sock to sio
Merge branches 'dev' and 'master' into dev