CS (WS) fixes
Merged pull request #357