Merge pull request #2 from nribeka/Fix-WS2.0

Fix ws2.0