fixed WS bug
Merge branch 'test'