Echo server update
Merge pull request #2 from vtortola/WebSocketListener-2

Echo server update