Fixed ws 2.x issues
Merge remote-tracking branch 'origin/master'