Add ws
Merge pull request #1481 from loyd/ws

Add ws