socket api improv
Merge branch 'master' of https://github.com/lamber-k/ZIA_API_NICE_2016
socket improv