non-python ws
Merge branch 'master' of github.com:vedranjukic/ca_ws