Web socket interface
Merge origin/master