ws only changes
Merge pull request #1175 from devoncarew/devoncarew_ws

ws only changes